| commit | d2cc56ebb38b0b9e792e81ba9db8148a3a4b72f6 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Thu Apr 24 10:27:04 2014 -0700 |
| committer | Craig Mautner <cmautner@google.com> | Thu Apr 24 10:27:37 2014 -0700 |
| tree | 6b8e7a11035ee33b00ebd88d6560e4fcb07bc185 | |
| parent | 80021878a840abffafd9c53e70d39ae2eef90841 [diff] | |
| parent | f8a5820817eb59e0fe16e3ce0f10bb3dca090192 [diff] |
resolved conflicts for merge of f8a58208 to master Conflicts: core/java/android/content/pm/PackageParser.java core/res/res/values/attrs_manifest.xml core/res/res/values/public.xml Change-Id: I747772e9dbc7ee1cf8993e574de4b3215f6833b2