| commit | 888eb73c6e86a18520cbaa999a18e8b039dbed4f | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Mon Sep 24 09:26:37 2012 -0700 |
| committer | Amith Yamasani <yamasani@google.com> | Mon Sep 24 09:26:37 2012 -0700 |
| tree | bbd29d6e227c5be9bc83e4200cbb456480a9db17 | |
| parent | 8658e1aa1fb0905852c4b0f5ae1d96cd2d56b6cf [diff] | |
| parent | 814f5ac3a16a74c9b5e365ee5e70b9db245fd340 [diff] |
resolved conflicts for merge of 814f5ac3 to jb-mr1-dev Change-Id: Ic65395ce932971dc9c37a481aa96da79a45d0f12