| commit | 6b48222adc40242b1fba6df1e824bc3a3b9c7b0b | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Tue Dec 06 23:49:30 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 06 23:49:30 2016 +0000 |
| tree | 135f5b9d6878f64ee1575c5ce78c8330f1f9438f | |
| parent | d5d067f2e88d84885ab26607b44ef9e494cc8c36 [diff] | |
| parent | 7179d1b4b6ca38f57a127a335766aba5d4dd1af7 [diff] |
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: a1f25b45e3 am: 7179d1b4b6 Change-Id: If8e7dee272e2c0a442852a3e3cec76618f2916e2