| commit | cbe696d9ec8dfca038af9713da6883acfe77095e | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Mon Feb 02 15:38:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 02 15:38:30 2015 +0000 |
| tree | d02a600341c9168164c4b99eead450824739c7b5 | |
| parent | 5af9bb2148ebf9ba08724825529871b179ac8eae [diff] | |
| parent | d14c0ceb663f190ad6b08dbdf4753aab8114e481 [diff] |
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base