| commit | d9a3f89a0727590a069c563a8b97fe99b866d67c | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Mon Oct 06 21:57:42 2014 -0700 |
| committer | Amit Mahajan <amitmahajan@google.com> | Mon Oct 06 21:57:42 2014 -0700 |
| tree | c3f033c09836108bae9509079b708ec8a53b22a4 | |
| parent | 770ed6ec920ec10798c5b7a7b4850ccc0b2a531f [diff] | |
| parent | 69555fc2c8726912ae5c1afb966c8a1b9c65400b [diff] |
Merge commit '69555fc2' into fix-merge-conflict3 Conflicts: core/res/res/values/symbols.xml Change-Id: I4266f1fcc51abc79235e1738bfbc3ff48e209e0c