| commit | 9396f183c2db5d6167f39a8d5667fb4abcc96e5e | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri Oct 19 17:16:41 2012 -0700 |
| committer | Kenny Root <kroot@google.com> | Fri Oct 19 17:16:41 2012 -0700 |
| tree | 3f7b1ce7830b96160af9c554e923eb7eeb8c02d7 | |
| parent | 4aed962612413d506f4682c1de8c9f3cfc453d60 [diff] | |
| parent | a5d29b2c14c2cbe7eeb1f3c41aeeffa1dd29f264 [diff] |
resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp Change-Id: I21512d61b5c08cee5fed69b34c3275ba5c3fc0d8