| commit | eb65ce0a240f9591019b8a40e17d25e86a131e35 | [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 | 14bf82e21f7a8bec4bdeb8092cc2a86e3784fc4f [diff] | |
| parent | 7c4ed6af79a14cc93cf3aa3de857d56d9c6db7b4 [diff] |
resolved conflicts for merge of 7c4ed6af to stage-aosp-master Change-Id: I52d0f66a6ad329daf19267be817c5a6d7118e7c4