| commit | 7743ece1634a17923112090374963d4919193c90 | [log] [tgz] |
|---|---|---|
| author | David Gross <dgross@google.com> | Wed Jun 15 15:37:23 2016 -0700 |
| committer | David Gross <dgross@google.com> | Wed Jun 15 15:37:23 2016 -0700 |
| tree | fad075eeee5410694953487363c37c7be3d7760e | |
| parent | 0c865d6a7f1c62dcd4a2c67a7a789b06cf2755f2 [diff] | |
| parent | 5333a55e366700162afe3c96548e9c7b310db30d [diff] |
resolve merge conflicts of 5333a55 to stage-aosp-master