| commit | a82930532f35f34da696dd00f1f511fcdbb56c8a | [log] [tgz] |
|---|---|---|
| author | repo sync <marcone@google.com> | Thu May 30 16:50:55 2013 -0700 |
| committer | repo sync <marcone@google.com> | Thu May 30 16:50:55 2013 -0700 |
| tree | 1cff6bdb76babdb31489d96513b6b1a663e7dadc | |
| parent | f2c2497c17dc5b4e97cae8ab2bba3c302dddfb4b [diff] | |
| parent | f72fde49a6c6e98635339cf5347ea5668e28a9e1 [diff] |
resolved conflicts for merge of f72fde49 to stage-aosp-master Change-Id: Id3f8e5514828c2f2ad053d8db8b64c048db9f8ab