| commit | 59701b9ba5c453e327bc0e6873a9f6ff87a10391 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed Nov 05 11:29:34 2014 -0800 |
| committer | Dan Albert <danalbert@google.com> | Wed Nov 05 11:29:34 2014 -0800 |
| tree | 586467b5d780f1844b1936b4ba98bf84b0b6cf40 | |
| parent | d00ced983ee235f72a9261fd967309a2638dde05 [diff] | |
| parent | 97014933f09006b432e02516cd6ea9756f37d3aa [diff] |
resolved conflicts for merge of 97014933 to stage-aosp-master Change-Id: I078368a7452b8cdc67f299985c60eef90f144367