| commit | 1690a458a20f7c27f68972aaf544fb308b03dcb1 | [log] [tgz] |
|---|---|---|
| author | quddusc <quddusc@google.com> | Tue May 13 15:16:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 15:16:27 2014 +0000 |
| tree | 159b54467091f0dcf043991bec8ba0cec5e05255 | |
| parent | 14db2c5a08c3f2d5214b93528afb911a06ec4124 [diff] | |
| parent | 0df291756efab4d01a1bf4769613ca96cb9cea68 [diff] |
am 0df29175: am 7ed813af: am fa2f9d89: Merge "Merge commit \'177a5df9\' into manualmerge2" into klp-dev-plus-aosp * commit '0df291756efab4d01a1bf4769613ca96cb9cea68':