| commit | 3a515cd3c04ac1fd30751858ae101016004e378b | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Wed Sep 16 15:56:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 15:56:34 2015 +0000 |
| tree | b8fdcec988ee4daa0a392dc800e8710616f4f005 | |
| parent | fbe287cacd3af28717150f8f43bfef0772700053 [diff] | |
| parent | c88194007596171b68624e08c055f796ed750b05 [diff] |
am c8819400: Merge "resolve merge conflicts of 930a3b5 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 * commit 'c88194007596171b68624e08c055f796ed750b05':