| commit | 9d02ab84846ebdb5c6ad89e70c4b8a366df92c97 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Mon Jul 13 22:50:02 2015 -0700 |
| committer | Unsuk Jung <unsuk@google.com> | Mon Jul 13 22:50:02 2015 -0700 |
| tree | a20c948c0beff91fe6545773dfca550363b4eeca | |
| parent | 5e671fabe635f30a9937f42f37bb812216c04597 [diff] | |
| parent | a97c792cbdef69101689d5aaa737812eea1384db [diff] |
resolve merge conflicts of a97c792 to kitkat-cts-dev Change-Id: I7598ab40b38b26e3ea6f38764dd6b6793e243c8f