| commit | 041ff5d5cd23b9acabc072847bf269ea1700ffb4 | [log] [tgz] |
|---|---|---|
| author | David Gross <dgross@google.com> | Thu Mar 26 19:44:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 19:44:33 2015 +0000 |
| tree | 048c0b77df65d9fad4eb81007542c7b5167ae42e | |
| parent | 825d400c97f00f39d9c190a24527c76f7b6e40ea [diff] | |
| parent | 1a5a2c58890e69b0554a82f22e3c0d1ffb238366 [diff] |
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/support into lmp-mr1-ub-dev