commit | e3c638a4fa64aa9be95c90cdefff3cdf5cc5f552 | [log] [tgz] |
---|---|---|
author | Russell Brenner <russellbrenner@google.com> | Wed Aug 27 06:13:55 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 27 06:13:55 2014 +0000 |
tree | 420dd64a701dcdd9fc32401a8879366f895b7cb1 | |
parent | 81dca1203784ea6dc580352a5fe1df0192562add [diff] | |
parent | 948397a4531e9dc8eb90f3fe98463b2c68624b2c [diff] |
Merge branch 'lmp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev