| commit | 7e74da3172cb175dd1fe4e1ffb48d8f7914225ca | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Fri Dec 05 19:16:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 05 19:16:27 2014 +0000 |
| tree | 7eed72fd8d79c84dabbcf50f0f08822a06303822 | |
| parent | 7abdfaa742b64ab5a68e0cede51f4fe30fd21662 [diff] | |
| parent | e97908d32ee8ea80138d085260a0eac93841c722 [diff] |
am e97908d3: Merge commit \'0953ab27\' into manualmerge * commit 'e97908d32ee8ea80138d085260a0eac93841c722': AAPT: Move private attrs to new type for framework