| commit | 006119bf2cd0b7f0ea3d1b6b0bbbfd413262504a | [log] [tgz] |
|---|---|---|
| author | Selim Gurun <sgurun@google.com> | Tue Apr 23 11:08:37 2013 -0700 |
| committer | Selim Gurun <sgurun@google.com> | Tue Apr 23 11:19:12 2013 -0700 |
| tree | 5ba6b3023f1bdd193fa70bb386e1c02424b90488 | |
| parent | 00cfba95ce5ea3c081b9d7353998f80a7c6edbc9 [diff] | |
| parent | 8237dd82bf151cb102a69243f91832be1c1294e4 [diff] |
Merge commit '8237dd82' into manualmerge Bug: 6923539 Skipping the change. We already fixed this in master and jb-mr2-dev in sha: 2905e18b03c6ce34739bed9c06b865b29087deea. A compatible change was submitted to jb-dev (and so automerged to jb-mr1-dev). see sha 7918cf4e6b18ab1aa4dce1cb791bb88ec1f383d6. The conflict occurs while merging 8237dd82bf151cb102a69243f91832be1c1294e4 which I thought was DO NOT MERGE anyway. Change-Id: If96e368d2e2cec98bc18069151a2ff861b53608f