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