commit | d849518369846cffdf75679fe70712fe89a573ad | [log] [tgz] |
---|---|---|
author | Vytautas Vaitukaitis <vytautas@google.com> | Thu Feb 26 18:53:10 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 26 18:53:10 2015 +0000 |
tree | 583978a5aaea5c5a98af3968857c0f78b22072d4 | |
parent | 319bdb63eb95b2a83e1142838dfc6680de80e83d [diff] | |
parent | 2a574d33313415a828703377b5ff6725f2e39918 [diff] |
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base