| commit | 0ef3d323d502281ce1ba0b6832fe40fafe65a1f9 | [log] [tgz] |
|---|---|---|
| author | Adrien Schildknecht <adriens@google.com> | Sat Dec 03 04:19:54 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Dec 03 04:19:54 2016 +0000 |
| tree | 373f88df4764cb9455c8d4d1dcfee7aba4d74470 | |
| parent | bc88eb67f777d92052dd60e3ac70b2d921287537 [diff] | |
| parent | f147e615ca21f17c504f8d550767eaa0f13d35af [diff] |
Manually merge commit 'c13da91' into stage-aosp-master am: ada51f3b8f am: 13f3b5337a am: f147e615ca Change-Id: I8ef3e288ab4247d13fc655dc91f028e5ed5dadae