| commit | b7f6ff3c2bd95f860066528775d352fc314e9d92 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 18 14:30:16 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu Jul 18 14:30:16 2013 -0700 |
| tree | 889cadcbbdf77df6aba8fdae57486746cd081408 | |
| parent | b755d1cb748157fc07e538838fa384856e118f31 [diff] | |
| parent | b61d93a4d472411e2127f139e7affecaec4950c9 [diff] |
resolved conflicts for merge of b61d93a4 to stage-aosp-master Change-Id: I25ce1463879e29398c0bf4b44c270c16a0bc1d03