commit | 2790c9fb2da9efde8d82f1c7758315c42f4847a6 | [log] [tgz] |
---|---|---|
author | Stephen Hines <srhines@google.com> | Mon Jul 16 17:05:27 2012 -0700 |
committer | Stephen Hines <srhines@google.com> | Mon Jul 16 17:05:27 2012 -0700 |
tree | e04a73026aedd63e9acb67a8a1127da686d9860f | |
parent | fde8f051763aa7bf23c7d64108f5723ab8288de5 [diff] | |
parent | b856e3fc12ae0573095c7272e8a556c1c0eaa57e [diff] |
resolved conflicts for merge of b856e3fc to jb-dev-plus-aosp Change-Id: I4ba117e8af6f3ffa5f17e21d63d4fb434bc19cc5