| commit | 48318b854fdf4c212472b884c9a1aa0452aaf363 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Mon Dec 07 18:13:48 2015 -0800 |
| committer | Andreas Gampe <agampe@google.com> | Mon Dec 07 18:13:48 2015 -0800 |
| tree | d31ca3346c48a652e99c97ae6fb0ac57a7566f3a | |
| parent | 8021521d9d6a4f031deca314b3c00694899784f9 [diff] | |
| parent | a960fcb4219978b7c8608270a9ccf4a7b7a3a7b7 [diff] |
resolve merge conflicts of a960fcb421 to master. Change-Id: I40251e2a4bd13f4781cd3663607183a5294b6276