| commit | 416891cff2349ddf303d3d52a5cea62903228dc0 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Jan 07 00:57:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 07 00:57:22 2015 +0000 |
| tree | 57cd4b5545b089234caae73b44fd87c47adda804 | |
| parent | 25bb2daec6a5782b7ddb9c8dcc19289651d4b5fe [diff] | |
| parent | 27ce2763325bcb7940232a11892e12fb86053cf7 [diff] |
am 27ce2763: Merge "resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again" into lmp-mr1-dev-plus-aosp * commit '27ce2763325bcb7940232a11892e12fb86053cf7': resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again