| commit | b1838b10defb41bb0e99a99a253014b109a3af91 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Wed Mar 22 18:40:18 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Mar 22 18:40:18 2017 +0000 |
| tree | 4287a03003b29b55dd87bd3e9d99701fcf99f34f | |
| parent | aee44accbc04c0e80ef6936597123db4725f3c33 [diff] | |
| parent | cc9e6f50ae67d6d3ac87c8b1ab94dd4a2e49457e [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into master am: 0b3c15f840 am: cc9e6f50ae Change-Id: I5a16b56e89f854693d5838fde4106cb744b56d76