| commit | 0199476939296795fdfdfc9635c9172e70495d2c | [log] [tgz] |
|---|---|---|
| author | Daniel Rosenberg <drosen@google.com> | Tue Sep 01 12:41:18 2015 -0700 |
| committer | Daniel Rosenberg <drosen@google.com> | Tue Sep 01 12:47:48 2015 -0700 |
| tree | 04ae00295efc912f631b95e0c3fd98e6633535a7 | |
| parent | 126ec0a9d60fa179341de78ae4ab52bffc3b3c9b [diff] | |
| parent | da4177e11fcbb65142ddf9a5da5583f0c1f6bc09 [diff] |
resolved conflicts for merge of 7c4ed6af to stage-aosp-master Change-Id: I52d0f66a6ad329daf19267be817c5a6d7118e7c4