OSDN Git Service

Merge commit '99d5938c'
authorBaligh Uddin <baligh@google.com>
Thu, 1 Aug 2013 22:04:30 +0000 (15:04 -0700)
committerBaligh Uddin <baligh@google.com>
Thu, 1 Aug 2013 22:04:30 +0000 (15:04 -0700)
commit15885f499850b1b0a4e3f18e685d6ac1f0e5200b
treef1732e5f788803d1046707d29331729d5c081a60
parent34605e1dcf4ac61109911836e7bba864f62080d6
parent99d5938cf26d818deb9b30917ffafcb4b6b46365
Merge commit '99d5938c'

Resolve conflict per ag/326799

Conflicts:
AndroidManifest.xml
AndroidManifest.xml