| commit | 8a70bcef5a724906e3c35c58cb2266ee9c9e1b78 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Mon May 12 18:57:34 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Mon May 12 18:57:34 2014 -0700 |
| tree | f2cb1b765259a60932381baaab6da5436d03b237 | |
| parent | 40fea8b1bf689933e63941b5fa5e3379f82c88b5 [diff] | |
| parent | 5a7b3b65b691edbdb855eb6154b8b30f5700acbb [diff] |
resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp Change-Id: I6bafdb9c6a8dfc6f55a4d9adf67f447661137eb8