| commit | 0eb268a0de02b73dd23ab2e672c35a2650a9eea4 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 21:07:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 21:07:31 2014 +0000 |
| tree | 80a3b4c13ba476ff76c868ae4d709c3280b7422d | |
| parent | 752b90f2605956e0de880c2a406dc887aeb3d8c2 [diff] | |
| parent | 22dabb52820d81744f46d009a27bf9294928bbee [diff] |
am 22dabb52: (-s ours) am c261cb0d: am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] * commit '22dabb52820d81744f46d009a27bf9294928bbee': Use ApplicationInfo only when not in edit mode [DO NOT MERGE]