| commit | 22fdce90973779314998f7ab90b36c39b618b344 | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Mon Jul 29 23:36:39 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jul 29 23:38:00 2013 +0000 |
| tree | 631c7c1f3bf14e56bb4b95d5ab2f9154f900c97e | |
| parent | e339319258e183d9b2e0c50177ab957d70dcb87c [diff] | |
| parent | 9e40e61e3b031eafc23a3b0a10918fe4bd99161a [diff] |
Merge "resolved conflicts for merge of 443feae6 to master"