| commit | eb6403e95d601b62be7b4610599e72fd329f2666 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Fri Apr 26 12:02:36 2013 -0700 |
| committer | Jeff Brown <jeffbrown@google.com> | Fri Apr 26 12:04:07 2013 -0700 |
| tree | c96fdc83af8f0154930e0ff38de2d6ba8e3f4879 | |
| parent | 962b038d011d06ef8803afaead33ad10ff0133ca [diff] | |
| parent | bfdd25663289546ad38586c87f5c0db6c6fb7812 [diff] |
resolved conflicts for merge of bfdd2566 to jb-mr2-dev-plus-aosp Change-Id: I42e15a186561222edd0d97047fcd207208a87282