| commit | 1716681bbacbadd18f3a538d6885bfc1db99437d | [log] [tgz] |
|---|---|---|
| author | Todd Kennedy <toddke@google.com> | Thu Aug 27 11:50:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:50:11 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | a1466767a5246fab60c8cc5402b9898b51ea847d [diff] | |
| parent | 427db834c0f82849ba0f71e3ff3b0096b8f6a4e2 [diff] |
am 94927221: (-s ours) am 1f6204a8: am 6782ca0b: Merge "Add a trace constant for PackageManager" * commit '9492722131ccb5280f29c161211399f8d93b8fef':