| commit | 69b5790ee241b50e9c5fb29d1dde1712ff536826 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Dec 07 00:22:07 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 07 00:22:07 2016 +0000 |
| tree | 1ac3cfd02f87db1fe5980781ba1e89ef7485d02c | |
| parent | 5ddedaad7f7ced1556c2b60b8c0c1d293c5f4ae8 [diff] | |
| parent | 281451edc56c512d9d4844dc59132b5de38769e3 [diff] |
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 82834baa35 am: eaa66c3082 -s ours am: f5795bcf54 -s ours am: 281451edc5 -s ours Change-Id: Ide00ab2b5f0d54bea5edfc5baa7c573af01327ff