commit | 64ec8011e17acc3fa97b3c755d0d093fdba33801 | [log] [tgz] |
---|---|---|
author | Jason Sams <jsams@google.com> | Fri Dec 06 17:46:54 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 06 17:46:54 2013 +0000 |
tree | d48d195c320ebd60b898447f1c5dc8cd4509d233 | |
parent | 5620e3ca20514614d6ed11b6619807117ffc46fa [diff] | |
parent | 7bb1a27f7306c4be9d6200a310db36819712899e [diff] |
am 7bb1a27f: (-s ours) am ece7581e: (-s ours) am 979eccd9: Merge "Sync IP JB sources with mr2." * commit '7bb1a27f7306c4be9d6200a310db36819712899e':