| commit | db7239b6ed368f4218b3c56d21fd603fd0577312 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Sep 28 15:52:33 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 28 15:52:33 2012 -0700 |
| tree | 0f6eece1a49f3ce0ba4c0c01b64d59587f937d9f | |
| parent | 1f2bed9b871685b6bd7bca6cebb9e2fb0f4d2243 [diff] | |
| parent | ce4edcd3257e88b5068cf62fe9ee6e9ceb817a95 [diff] |
am ce4edcd3: Merge from jb-mr1-aah-dev * commit 'ce4edcd3257e88b5068cf62fe9ee6e9ceb817a95':