| commit | 7a26db30134d4e3528acd7786ddcbd74022c960e | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Mon May 12 23:30:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 12 23:30:35 2014 +0000 |
| tree | db34eca2da5ec1662b262862fc44c323209fcb14 | |
| parent | 48738a4dac28c9dcf05b2a2fbcc59fecb57a610b [diff] | |
| parent | 78d9bec5cb4faf0c0f6b5f73d2b42d398ad62e01 [diff] |
am 78d9bec5: am 2b96d6ae: resolved conflicts for merge of 77efd7b4 to master * commit '78d9bec5cb4faf0c0f6b5f73d2b42d398ad62e01':