| commit | f4d3973c319502fc8aa3e1aa1d7e7502274ea3aa | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Mon Jan 05 23:36:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 05 23:36:57 2015 +0000 |
| tree | e0eb07371d830835923cd8bc179e9064393b6afa | |
| parent | d17218e7df24da8a2bcf6e7714dc0151155c3286 [diff] | |
| parent | 9c8f8ed8a8bee42ee48a27b055b11ace6255d09a [diff] |
am 9c8f8ed8: am 4a5baeae: Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev * commit '9c8f8ed8a8bee42ee48a27b055b11ace6255d09a': resolved conflicts for a0bc2e7e to lmp-mr1-dev