| commit | 215d79021b13f2555e137c3cae46653965718bb4 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Wed Mar 25 17:27:20 2015 -0700 |
| committer | Qiwen Zhao <zhao@google.com> | Wed Mar 25 17:27:20 2015 -0700 |
| tree | c13a436f37a776b9111a67a85d418897fef51eae | |
| parent | cb5f1959c04d099a1b748fa5f9efe8114e152d75 [diff] | |
| parent | 3b6f469a658c71ec5a118a1528fe6559a0a8fd9e [diff] |
Merge branch 'lmp-mr1-ub-dev' of persistent-https://googleplex-android.git.corp.google.com/platform/frameworks/support into lmp-mr1-ub-dev