| commit | 69e61b5a5be11f9adab3bdab4bfe1cc0c4c95c0f | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Oct 27 02:50:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 27 02:50:36 2014 +0000 |
| tree | b2bf36c3f000da0e07698477c5859f099a08ea5a | |
| parent | bae8d7e64afedc973ff27881e37779810d24e48c [diff] | |
| parent | 5a71f83227f0340a265f34b226d8fe01d4dd9773 [diff] |
am 5a71f832: (-s ours) Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master * commit '5a71f83227f0340a265f34b226d8fe01d4dd9773':