commit | bbb6f8503b62fdebe5cef7aedfea28f505fa4fe9 | [log] [tgz] |
---|---|---|
author | Wink Saville <wink@google.com> | Wed Sep 03 23:46:29 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 03 23:46:29 2014 +0000 |
tree | e3de7ac2578a3cefe880c6b5693aaf0b7656869b | |
parent | 2e0c5d32c3c7d52ed4087d2fb7842c2aee41e8dd [diff] | |
parent | d8ca408420eeeee109f3ce1b288e88ddbd8d3f33 [diff] |
am 1a9c704c: am 3c95cae1: Merge "Rename getActivatedXxx to getActiveXxx" into lmp-dev * commit '1a9c704c1991417a45cc587b3e118eb98f87e39a': Rename getActivatedXxx to getActiveXxx