| commit | f7556dfc7af3e6b9cff64aba0d23e4205d576f2c | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Mon Sep 21 22:06:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 22:06:51 2015 +0000 |
| tree | 9779095e5a603526d44704c559c820d3628c5ea8 | |
| parent | e394de9e345647ef306a9b7b410d7f8e8de6497c [diff] | |
| parent | 285f632cba3fb58e7c0c2e5028b0607ab4aaf2d6 [diff] |
am 431e350e: am 7036d2e6: am a6429cf4: am 285f632c: am 55eece28: am 68e1d359: am 3bbdccc7: am c06d3091: am b640b49e: am 9feaaaf4: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 * commit '431e350e62ca293447ea5f52d38588bb47bbbde1':