| commit | a4e9d09ea9a3195e5ba93ffafb54fc15fc109f2b | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Wed Sep 02 14:07:35 2015 -0700 |
| committer | Chad Brubaker <cbrubaker@google.com> | Wed Sep 02 14:07:35 2015 -0700 |
| tree | fa37b3e1b195c283b8e7101e15bc7c10bf78ecb0 | |
| parent | 29ad827a0486a083d50256be1b77c08a352e4446 [diff] | |
| parent | 520d9ab35592c182fee61f9722e62d1acc9a37e8 [diff] |
resolved conflicts for merge of 520d9ab3 to stage-aosp-master Change-Id: I4dc12386a7ca9b814c674f0d9a44acfb817e8762