| commit | 8734db386cdbaf9df7a75558acf71f9cf792cb36 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri May 02 22:16:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 02 22:16:15 2014 +0000 |
| tree | 4e9a00239b871adea90374c0dcb8e6f921926bdf | |
| parent | 85af2edf798f45b4b4a8a92cbf84e36d8af7b653 [diff] | |
| parent | 090e3b5437b6e15c99b743672542991326c00b16 [diff] |
am 090e3b54: (-s ours) am 99879842: am 3d564043: am 7b5a7434: am 288d32b9: (-s ours) am 17e0eebd: am 465cb53b: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] * commit '090e3b5437b6e15c99b743672542991326c00b16': Use ApplicationInfo only when not in edit mode [DO NOT MERGE]