| commit | f5795bcf543bf3091b0b8ad43b4287b534e746da | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Dec 07 00:06:43 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 07 00:06:43 2016 +0000 |
| tree | 926160bea7dbf453c5a5bb2fca9d4111c732621d | |
| parent | 33e8de479ab373767ef38de24c17aec326281c52 [diff] | |
| parent | eaa66c3082a603a0cf465eb69f989fc67b585a06 [diff] |
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 82834baa35 am: eaa66c3082 -s ours Change-Id: I009f3327782fdb3506d30cbf75f59bbed31ed2e1